Fixes #70782 and some drag dest rectangle/line issues

Thu Feb  7 19:39:27 2002  Kristian Rietveld  <kris@gtk.org>

        Fixes #70782 and some drag dest rectangle/line issues

        * gtk/gtktreeview.c (gtk_tree_view_set_model): set
        GTK_TREE_VIEW_IS_LIST flag (we can switch from a TreeStore to a
        ListStore for example)
        (gtk_tree_view_get_path_at_pos): revert previous change, we
        shouldn't correct for the header, because we are taking bin_window
        coordinates here
        (gtk_tree_view_set_drag_dest_row): queue old drag_dest row and
        upper/lower neighbors for draw, so the drag dest rectangle/line will
        be cleared correctly
        (gtk_tree_view_get_dest_row_at_pos): correct for treeview header
        here, as drag_y is relative to the widget and _get_path_at_pos wants
        coords relative to bin_window, draw black outline rectangle after
        drawing the cells

diff --git a/ChangeLog b/ChangeLog
index 0c35dfc636bb745feb50acfeb1121881292038ec..beac72b52198f32544af8f3f0088e1bd226018cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+Thu Feb  7 19:39:27 2002  Kristian Rietveld  <kris@gtk.org>
+
+       Fixes #70782 and some drag dest rectangle/line issues
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_model): set
+       GTK_TREE_VIEW_IS_LIST flag (we can switch from a TreeStore to a
+       ListStore for example)
+       (gtk_tree_view_get_path_at_pos): revert previous change, we
+       shouldn't correct for the header, because we are taking bin_window
+       coordinates here
+       (gtk_tree_view_set_drag_dest_row): queue old drag_dest row and
+       upper/lower neighbors for draw, so the drag dest rectangle/line will
+       be cleared correctly
+       (gtk_tree_view_get_dest_row_at_pos): correct for treeview header
+       here, as drag_y is relative to the widget and _get_path_at_pos wants
+       coords relative to bin_window, draw black outline rectangle after
+       drawing the cells
+
 Thu Feb  7 10:53:12 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_draw_text): Use layout text

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 0c35dfc636bb745feb50acfeb1121881292038ec..beac72b52198f32544af8f3f0088e1bd226018cb 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,21 @@
+Thu Feb  7 19:39:27 2002  Kristian Rietveld  <kris@gtk.org>
+
+       Fixes #70782 and some drag dest rectangle/line issues
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_model): set
+       GTK_TREE_VIEW_IS_LIST flag (we can switch from a TreeStore to a
+       ListStore for example)
+       (gtk_tree_view_get_path_at_pos): revert previous change, we
+       shouldn't correct for the header, because we are taking bin_window
+       coordinates here
+       (gtk_tree_view_set_drag_dest_row): queue old drag_dest row and
+       upper/lower neighbors for draw, so the drag dest rectangle/line will
+       be cleared correctly
+       (gtk_tree_view_get_dest_row_at_pos): correct for treeview header
+       here, as drag_y is relative to the widget and _get_path_at_pos wants
+       coords relative to bin_window, draw black outline rectangle after
+       drawing the cells
+
 Thu Feb  7 10:53:12 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_draw_text): Use layout text

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0c35dfc636bb745feb50acfeb1121881292038ec..beac72b52198f32544af8f3f0088e1bd226018cb 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,21 @@
+Thu Feb  7 19:39:27 2002  Kristian Rietveld  <kris@gtk.org>
+
+       Fixes #70782 and some drag dest rectangle/line issues
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_model): set
+       GTK_TREE_VIEW_IS_LIST flag (we can switch from a TreeStore to a
+       ListStore for example)
+       (gtk_tree_view_get_path_at_pos): revert previous change, we
+       shouldn't correct for the header, because we are taking bin_window
+       coordinates here
+       (gtk_tree_view_set_drag_dest_row): queue old drag_dest row and
+       upper/lower neighbors for draw, so the drag dest rectangle/line will
+       be cleared correctly
+       (gtk_tree_view_get_dest_row_at_pos): correct for treeview header
+       here, as drag_y is relative to the widget and _get_path_at_pos wants
+       coords relative to bin_window, draw black outline rectangle after
+       drawing the cells
+
 Thu Feb  7 10:53:12 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_draw_text): Use layout text

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 0c35dfc636bb745feb50acfeb1121881292038ec..beac72b52198f32544af8f3f0088e1bd226018cb 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,21 @@
+Thu Feb  7 19:39:27 2002  Kristian Rietveld  <kris@gtk.org>
+
+       Fixes #70782 and some drag dest rectangle/line issues
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_model): set
+       GTK_TREE_VIEW_IS_LIST flag (we can switch from a TreeStore to a
+       ListStore for example)
+       (gtk_tree_view_get_path_at_pos): revert previous change, we
+       shouldn't correct for the header, because we are taking bin_window
+       coordinates here
+       (gtk_tree_view_set_drag_dest_row): queue old drag_dest row and
+       upper/lower neighbors for draw, so the drag dest rectangle/line will
+       be cleared correctly
+       (gtk_tree_view_get_dest_row_at_pos): correct for treeview header
+       here, as drag_y is relative to the widget and _get_path_at_pos wants
+       coords relative to bin_window, draw black outline rectangle after
+       drawing the cells
+
 Thu Feb  7 10:53:12 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_draw_text): Use layout text

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0c35dfc636bb745feb50acfeb1121881292038ec..beac72b52198f32544af8f3f0088e1bd226018cb 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,21 @@
+Thu Feb  7 19:39:27 2002  Kristian Rietveld  <kris@gtk.org>
+
+       Fixes #70782 and some drag dest rectangle/line issues
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_model): set
+       GTK_TREE_VIEW_IS_LIST flag (we can switch from a TreeStore to a
+       ListStore for example)
+       (gtk_tree_view_get_path_at_pos): revert previous change, we
+       shouldn't correct for the header, because we are taking bin_window
+       coordinates here
+       (gtk_tree_view_set_drag_dest_row): queue old drag_dest row and
+       upper/lower neighbors for draw, so the drag dest rectangle/line will
+       be cleared correctly
+       (gtk_tree_view_get_dest_row_at_pos): correct for treeview header
+       here, as drag_y is relative to the widget and _get_path_at_pos wants
+       coords relative to bin_window, draw black outline rectangle after
+       drawing the cells
+
 Thu Feb  7 10:53:12 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_draw_text): Use layout text

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0c35dfc636bb745feb50acfeb1121881292038ec..beac72b52198f32544af8f3f0088e1bd226018cb 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,21 @@
+Thu Feb  7 19:39:27 2002  Kristian Rietveld  <kris@gtk.org>
+
+       Fixes #70782 and some drag dest rectangle/line issues
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_model): set
+       GTK_TREE_VIEW_IS_LIST flag (we can switch from a TreeStore to a
+       ListStore for example)
+       (gtk_tree_view_get_path_at_pos): revert previous change, we
+       shouldn't correct for the header, because we are taking bin_window
+       coordinates here
+       (gtk_tree_view_set_drag_dest_row): queue old drag_dest row and
+       upper/lower neighbors for draw, so the drag dest rectangle/line will
+       be cleared correctly
+       (gtk_tree_view_get_dest_row_at_pos): correct for treeview header
+       here, as drag_y is relative to the widget and _get_path_at_pos wants
+       coords relative to bin_window, draw black outline rectangle after
+       drawing the cells
+
 Thu Feb  7 10:53:12 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_draw_text): Use layout text

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0c35dfc636bb745feb50acfeb1121881292038ec..beac72b52198f32544af8f3f0088e1bd226018cb 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,21 @@
+Thu Feb  7 19:39:27 2002  Kristian Rietveld  <kris@gtk.org>
+
+       Fixes #70782 and some drag dest rectangle/line issues
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_model): set
+       GTK_TREE_VIEW_IS_LIST flag (we can switch from a TreeStore to a
+       ListStore for example)
+       (gtk_tree_view_get_path_at_pos): revert previous change, we
+       shouldn't correct for the header, because we are taking bin_window
+       coordinates here
+       (gtk_tree_view_set_drag_dest_row): queue old drag_dest row and
+       upper/lower neighbors for draw, so the drag dest rectangle/line will
+       be cleared correctly
+       (gtk_tree_view_get_dest_row_at_pos): correct for treeview header
+       here, as drag_y is relative to the widget and _get_path_at_pos wants
+       coords relative to bin_window, draw black outline rectangle after
+       drawing the cells
+
 Thu Feb  7 10:53:12 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_draw_text): Use layout text

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 70f62029a5f3cb1288405d78266abef92dccf4e5..bb9c29702672d636521f0e6fe7ff8232a634cdbd 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -6745,6 +6745,7 @@ gtk_tree_view_set_model (GtkTreeView  *tree_view,
 
       g_object_unref (tree_view->priv->model);
       tree_view->priv->search_column = -1;
+      GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_IS_LIST);
     }
 
   tree_view->priv->model = model;
@@ -8487,7 +8488,7 @@ gtk_tree_view_get_path_at_pos (GtkTreeView        *tree_view,
     }
 
   y_offset = _gtk_rbtree_find_offset (tree_view->priv->tree,
-                                     TREE_WINDOW_Y_TO_RBTREE_Y (tree_view, y - TREE_VIEW_HEADER_HEIGHT (tree_view)),
+                                     TREE_WINDOW_Y_TO_RBTREE_Y (tree_view, y),
                                      &tree, &node);
 
   if (tree == NULL)
@@ -8844,12 +8845,6 @@ gtk_tree_view_set_drag_dest_row (GtkTreeView            *tree_view,
   if (tree_view->priv->drag_dest_row)
     current_dest = gtk_tree_row_reference_get_path (tree_view->priv->drag_dest_row);
 
-  if (current_dest)
-    {
-      gtk_tree_view_queue_draw_path (tree_view, current_dest, NULL);
-      gtk_tree_path_free (current_dest);
-    }
-
   if (tree_view->priv->drag_dest_row)
     gtk_tree_row_reference_free (tree_view->priv->drag_dest_row);
 
@@ -8863,6 +8858,26 @@ gtk_tree_view_set_drag_dest_row (GtkTreeView            *tree_view,
     }
   else
     tree_view->priv->drag_dest_row = NULL;
+
+  if (current_dest)
+    {
+      GtkRBTree *tree, *new_tree;
+      GtkRBNode *node, *new_node;
+
+      _gtk_tree_view_find_node (tree_view, current_dest, &tree, &node);
+      _gtk_tree_view_queue_draw_node (tree_view, tree, node, NULL);
+
+      if (tree && node)
+       {
+         _gtk_rbtree_next_full (tree, node, &new_tree, &new_node);
+         if (new_tree && new_node)
+           _gtk_tree_view_queue_draw_node (tree_view, new_tree, new_node, NULL);
+
+         _gtk_rbtree_prev_full (tree, node, &new_tree, &new_node);
+         if (new_tree && new_node)
+           _gtk_tree_view_queue_draw_node (tree_view, new_tree, new_node, NULL);
+       }
+    }
 }
 
 void
@@ -8920,7 +8935,8 @@ gtk_tree_view_get_dest_row_at_pos (GtkTreeView             *tree_view,
    */
 
   if (!gtk_tree_view_get_path_at_pos (tree_view,
-                                      drag_x, drag_y,
+                                      drag_x,
+                                     drag_y - TREE_VIEW_HEADER_HEIGHT (tree_view),
                                       &tmp_path,
                                       &column,
                                       NULL,
@@ -9037,13 +9053,6 @@ gtk_tree_view_create_row_drag_icon (GtkTreeView  *tree_view,
                       bin_window_width + 2,
                       background_area.height + 2);
 
-  gdk_draw_rectangle (drawable,
-                      widget->style->black_gc,
-                      FALSE,
-                      0, 0,
-                      bin_window_width + 1,
-                      background_area.height + 1);
-
   for (list = tree_view->priv->columns; list; list = list->next)
     {
       GtkTreeViewColumn *column = list->data;
@@ -9084,6 +9093,13 @@ gtk_tree_view_create_row_drag_icon (GtkTreeView  *tree_view,
       cell_offset += column->width;
     }
 
+  gdk_draw_rectangle (drawable,
+                      widget->style->black_gc,
+                      FALSE,
+                      0, 0,
+                      bin_window_width + 1,
+                      background_area.height + 1);
+
   return drawable;
 }